gtk-demo: gtk_widget_render_icon() => gtk_widget_render_icon_pixbuf()

diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index 09f48d46534731f5e9a5ecdb86fc7884cc5b6ada..232d345c07c57455dc64e722c6fea111ad53e908 100644 (file)
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -110,7 +110,7 @@ create_page1 (GtkWidget *assistant)
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 1");
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), box, GTK_ASSISTANT_PAGE_INTRO);
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
   g_object_unref (pixbuf);
 }
@@ -133,7 +133,7 @@ create_page2 (GtkWidget *assistant)
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), box, "Page 2");
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), box, pixbuf);
   g_object_unref (pixbuf);
 }
@@ -152,7 +152,7 @@ create_page3 (GtkWidget *assistant)
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), label, "Confirmation");
 
-  pixbuf = gtk_widget_render_icon (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (assistant, GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
   gtk_assistant_set_page_header_image (GTK_ASSISTANT (assistant), label, pixbuf);
   g_object_unref (pixbuf);
 }

diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index e77b88c9b26274f5095c75f143c44ce0402f06cb..e48eb509ed46cf522664b0c4de21c59f1e0d691b 100644 (file)
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -77,8 +77,8 @@ get_image_pixbuf (GtkImage *image)
       return g_object_ref (gtk_image_get_pixbuf (image));
     case GTK_IMAGE_STOCK:
       gtk_image_get_stock (image, &stock_id, &size);
-      return gtk_widget_render_icon (GTK_WIDGET (image),
-                                     stock_id, size, NULL);
+      return gtk_widget_render_icon_pixbuf (GTK_WIDGET (image),
+                                            stock_id, size);
     default:
       g_warning ("Image storage type %d not handled",
                  gtk_image_get_storage_type (image));

diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index fbe6c12eeb404cf5cf420237f6ce9f154d91de65..e9bf96ba22e8a876ec393f429fb17cea2ea9eb05 100644 (file)
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -65,8 +65,8 @@ create_stock_icon_store (void)
     {
       if (stock_id[i])
        {
-         pixbuf = gtk_widget_render_icon (cellview, stock_id[i],
-                                          GTK_ICON_SIZE_BUTTON, NULL);
+         pixbuf = gtk_widget_render_icon_pixbuf (cellview, stock_id[i],
+                                                 GTK_ICON_SIZE_BUTTON);
          gtk_stock_lookup (stock_id[i], &item);
          label = strip_underscore (item.label);
          gtk_list_store_append (store, &iter);

diff --git a/demos/gtk-demo/stock_browser.c b/demos/gtk-demo/stock_browser.c
index e6fed81dd430a0727562c290bbbc442f15cd1faf..d0d3442034c00f057cc89c66cfc3288d81976574 100644 (file)
--- a/demos/gtk-demo/stock_browser.c
+++ b/demos/gtk-demo/stock_browser.c
@@ -166,9 +166,9 @@ create_model (void)
             }
           g_free (sizes);
           
-          info.small_icon = gtk_widget_render_icon (window, info.id,
-                                                    size,
-                                                    NULL);
+          info.small_icon = gtk_widget_render_icon_pixbuf (window, 
+                                                           info.id,
+                                                           size);
           
           if (size != GTK_ICON_SIZE_MENU)
             {

diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c
index 2431d6a4fe4f577fe713fbc0ba752c91e69b2b07..73ab5c1878b7f639d46b473ed23797b5644b0344 100644 (file)
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -41,7 +41,7 @@ canvas_item_new (GtkWidget     *widget,
   GdkPixbuf *pixbuf;
 
   stock_id = gtk_tool_button_get_stock_id (button);
-  pixbuf = gtk_widget_render_icon (widget, stock_id, GTK_ICON_SIZE_DIALOG, NULL);
+  pixbuf = gtk_widget_render_icon_pixbuf (widget, stock_id, GTK_ICON_SIZE_DIALOG);
 
   if (pixbuf)
     {